Fix tooltips.

2006-05-08  Matthias Clasen  <mclasen@redhat.com>

	* gtk/gtkuimanager.c (update_node): Fix tooltips.

diff --git a/ChangeLog b/ChangeLog
index a887edfc2958aaa172495e39493d6f84fcac3cda..c4680a469f1de6c619c6fb8d54eb4f5349e2d410 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2006-05-08  Matthias Clasen  <mclasen@redhat.com>
 
+       * gtk/gtkuimanager.c (update_node): Fix tooltips.
+
        * configure.in: Require Pango 1.13.0
 
        * gtk/gtknotebook.c: 

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index a887edfc2958aaa172495e39493d6f84fcac3cda..c4680a469f1de6c619c6fb8d54eb4f5349e2d410 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,5 +1,7 @@
 2006-05-08  Matthias Clasen  <mclasen@redhat.com>
 
+       * gtk/gtkuimanager.c (update_node): Fix tooltips.
+
        * configure.in: Require Pango 1.13.0
 
        * gtk/gtknotebook.c: 

diff --git a/gtk/gtkuimanager.c b/gtk/gtkuimanager.c
index bc96c8e05eba8d4c8183864a612102c09f81fc8b..68e2f3359bfbbb4832c234c2b415b0cbe361eed5 100644 (file)
--- a/gtk/gtkuimanager.c
+++ b/gtk/gtkuimanager.c
@@ -2467,11 +2467,16 @@ update_node (GtkUIManager *self,
          gtk_action_connect_proxy (action, info->proxy);
        }
 
-      /* FIXME: we must trigger the notify::tooltip handler, since 
-       * tooltips on toolitems can't be set before the toolitem 
-       * is added to the toolbar.
+      /* FIXME: we must re-set the tooltip, since tooltips on toolitems can't be 
+       * set before the toolitem is added to the toolbar.
        */
-      g_object_notify (G_OBJECT (action), "tooltip");
+      {
+       gchar *tooltip;
+
+       g_object_get (G_OBJECT (action), "tooltip", &tooltip, NULL);
+       g_object_set (G_OBJECT (action), "tooltip", tooltip, NULL);
+       g_free (tooltip);
+      }
 
       g_signal_connect (info->proxy, "notify::visible",
                        G_CALLBACK (update_smart_separators), NULL);